From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 16 Mar 2010 00:21:21 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8376^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=09d167e7f0c56861c989953e06e1cbd84dbe18db;p=emacs.git

Merge from mainline.
---

09d167e7f0c56861c989953e06e1cbd84dbe18db